Remove conflict marker.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83a9434b254d5adee1822d521200433bcc1885af..51b42ebf997272b6a3e2f4f2590768c156a1e7c1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -45,7 +45,6 @@
 
        * desktop.el: Delete header line listing me as maintainer.
 
->>>>>>> 1.10749
 2007-02-28  Glenn Morris  <rgm@gnu.org>
 
        * tutorial.el (tutorial--describe-nonstandard-key): Tweak text in